-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Web Proxy] Use staging server for Web, Desktop when the "Use staging server" toggle is ON. #16432
[Web Proxy] Use staging server for Web, Desktop when the "Use staging server" toggle is ON. #16432
Conversation
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
@neil-marcellini @sobitneupane One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of questions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IF .env is defined,
When UseStagingServer toggle is toggled on, 'STAGING_EXPENSIFY_URL' will be used from .env
When UseStagingServer toggle is toggled off, 'EXPENSIFY_URL' will be used from .env
EXPENSIFY_URL=https://www.expensify.com/
STAGING_EXPENSIFY_URL=https://staging.expensify.com/
@mountiny Will this configuration work for dev api(.com.dev) as well? I won't be able to test on dev api.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall looks good
- not sure whether we need the
.env.example
change
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I turn on Use staging server with my dev .env file then all my api requests fail because they are sent to staging. I think we want to still send the requests to expensify.com.dev in that case. I believe that's why we reverted the PR last time.
Screen.Recording.2023-03-23.at.11.59.29.AM.mov
@neil-marcellini I believe that in this case, if we make the following changes to the
|
Yeah, my last comment is about that: #16432 (comment) So basically the toggle would do nothing for you - it won't change the API
|
@Prince-Mendiratta Yeah but I think the point is we don't want to ask all internal engineers to make that change if we can avoid it. |
Another possibility that opens up is that we can match if the |
Question: I think you'd be changing some ngrok setting and you won't really use the toggle |
We make a backup of our I'm fine with hiding the "use staging server" toggle when using internal development environment. |
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
@neil-marcellini @kidroca @sobitneupane updated, please have a look! |
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ LGTM!
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Yep, I just comment out the internal vm .env and add the staging one |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Prince-Mendiratta Left one comment
To conclude and summarise the changes that this PR introduces, we should define the environments, platforms and the actors. Actor 1: External Developer. (Contributor) Environment 1: DEV. (Contributor) Platform 1: Web Now, the "Use staging toggle" is available only for Actor 1 and Actor 3 on Env 1 and 3, for all platforms. For Web, there are 2 ways to run the app:
For native apps, For desktop, no proxy is used and the requests are sent directly to the endpoints. So now, no changes need to be made anywhere to the |
@Prince-Mendiratta Great comprehensive write-up, thank you very much 🙇 |
Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
Since the contents of the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for working on this!
Hi @neil-marcellini and all. Hope you guys had a great weekend. I think today can be the D-Day for this issue, can you please review it? |
@Prince-Mendiratta great job indeed. I think @neil-marcellini should be able to finish this one today! |
Yes I will take a look soon! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok I think this is good to go. Thank you.
@sobitneupane all you for the reviewer checklist. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issues
section above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Tests
section - I verified the steps for Staging and/or Production testing are in the
QA steps
section - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReport
and notonIconClick
). - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*
files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is correct English and approved by marketing by adding the
Waiting for Copy
label for a copy review on the original GH to get the correct copy. - I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md
) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar
, I verified the components usingAvatar
have been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avatar
is modified, I verified thatAvatar
is working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If a new page is added, I verified it's using the
ScrollView
component to make it scrollable when more elements are added to the page. - If the
main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.2.91-0 🚀
|
🚀 Deployed to production by https://github.com/luacmartins in version: 1.2.91-1 🚀
|
Details
With this PR, we are adding the ability to map all requests to production / staging API depending on the "Use staging server" toggle in user preferences. This change only affects the Development and Staging Environment.
Fixed Issues
$ #12315
PROPOSAL: #12315 (comment)
Tests
.env is not defined
Use staging server
toggle ON.Use staging server
toggle OFF.Expected Console Output
Note: There is a known issue in Android where when repeating the above tests will lead to an error. This will be tackled in this github issue.
Note 2: You might see an "Internal React error: Attempted to capture" error while testing but that is being tackled in #13917 and is not related to current changes.
Offline tests
N/A, doesn't affect the offline functionality, should behave the same as expected behaviour when offline.
QA Steps
This doesn't affect the production behaviour. For staging,
Use staging server
toggle ON.Use staging server
toggle OFF.PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.Screenshots/Videos
without .env defined
Web
web-envless.mp4
Mobile Web - Chrome
android-chrome-envless.mp4
Mobile Web - Safari
ios-safari-envless.mp4
Desktop
desktop-envless.mp4
iOS
ios-envless.mp4
Android
android-envless.mp4